From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 11 Jan 2026 20:53:33 +0000 (+0000)
Subject: Merge version 2021.8.0-2+rpi1 and 2021.8.0-2+deb12u1 to produce 2021.8.0-2+rpi1+deb12u1
X-Git-Tag: archive/raspbian/2021.8.0-2+rpi1+deb12u1^0
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=afef6f38366fbb1084d86825e1ed5f8bd3512c0f;p=onetbb.git

Merge version 2021.8.0-2+rpi1 and 2021.8.0-2+deb12u1 to produce 2021.8.0-2+rpi1+deb12u1
---

afef6f38366fbb1084d86825e1ed5f8bd3512c0f
diff --cc debian/changelog
index 170a885,af8c9bc..b5821dd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,21 @@@
- onetbb (2021.8.0-2+rpi1) bookworm-staging; urgency=medium
++onetbb (2021.8.0-2+rpi1+deb12u1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 2021.5.0-12+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 01 Jul 2022 09:58:06 +0000]
 +  * Link against libatomic on armhf too.
 +  * Fix clean target.
 +
 +  [changes introduced in 2021.5.0-15+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 03 Jun 2023 05:32:35 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 11 Jan 2026 20:53:33 +0000
++
+ onetbb (2021.8.0-2+deb12u1) bookworm; urgency=medium
+ 
+   * Team upload.
+   * Skip some tests when the machine has a single CPU. Closes: #1108053.
+   * Skip test_mutex, it fails in Salsa CI. Closes: #1094260.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Sun, 28 Sep 2025 19:50:00 +0200
  
  onetbb (2021.8.0-2) unstable; urgency=medium